Add Hysteria2 Protocol #2721

JimmyHuang454 · 2023-10-22T06:49:17Z

Use hysteria's quic-go to support BBR and brutal congestion algorithm

Same as hysteria, BBR and Brutal congestion algorithm can improve performance.

Usage:

send_mbps is needed when congestion's type is brutal, meaning the max bandwidth of current network can use to send.

{
  "transport":"quic",
  "transportSettings":{
      "congestion": {"type":"brutal", "send_mbps": 200}
  },
  "security":"tls",
  "securitySettings":{}
}

If user don't know how to config brutal, it's just ok to use bbr in both client and server side.

{
  "transport":"quic",
  "transportSettings":{
      "congestion": {"type":"bbr"}
  },
  "security":"tls",
  "securitySettings":{}
}

Fix `vprotogen` bug and update all Protobuf data

vprotogen can not work, because it failed to recognize new version of protoc, so that we can not add new feature to v2ray.

Update go version to 1.21

fix #2701 #2644

codecov-commenter · 2023-10-24T03:27:43Z

Codecov Report

Attention: 1048 lines in your changes are missing coverage. Please review.

Comparison is base (cb84b28) 37.79% compared to head (0b7f037) 36.78%.
Report is 5 commits behind head on master.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2721      +/-   ##
==========================================
- Coverage   37.79%   36.78%   -1.01%     
==========================================
  Files         654      664      +10     
  Lines       38723    39771    +1048     
==========================================
- Hits        14636    14631       -5     
- Misses      22477    23524    +1047     
- Partials     1610     1616       +6

Files	Coverage Δ
app/dns/nameserver_quic.go	`70.94% <ø> (ø)`
common/protocol/quic/sniff.go	`44.87% <ø> (ø)`
config.pb.go	`29.34% <ø> (ø)`
transport/internet/quic/conn.go	`58.00% <ø> (ø)`
transport/internet/quic/hub.go	`75.34% <100.00%> (+2.61%)`	⬆️
...ransport/internet/quic/congestion/bbr/bandwidth.go	`0.00% <0.00%> (ø)`
transport/internet/quic/congestion/bbr/clock.go	`0.00% <0.00%> (ø)`
transport/internet/grpc/dial.go	`3.27% <0.00%> (-0.06%)`	⬇️
transport/internet/quic/congestion/utils.go	`0.00% <0.00%> (ø)`
transport/internet/quic/dialer.go	`55.72% <63.33%> (-2.40%)`	⬇️
... and 8 more

... and 6 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

JimmyHuang454 · 2023-10-26T04:00:58Z

I had merged newest commit and fixed go-lint.

xiaokangwang · 2023-10-28T19:06:32Z

Hi! Thanks for your contribution. Since this merge request includes switching the dependency, it will be a longer review process, however I will try my best to expatiate the process.

xiaokangwang · 2023-10-29T14:45:25Z

Hi, after some interal discuss, it seems there is no active maintainer within V2Ray could take over the maintaince of hysteria transport. Is it possible for you to refactor this code, so that the original quic transport is left as is, and make the necessary change to make hysteria a new transport that can be disabled when something goes wrong by removing the import line in https://github.com/v2fly/v2ray-core/blob/master/main/distro/all/all.go .

xiaokangwang · 2023-10-29T14:46:16Z

I am happy to merge it after the usage of forked quic from hysteria is isolated from main quic.

JimmyHuang454 · 2023-10-30T11:13:26Z

I am happy to merge it after the usage of forked quic from hysteria is isolated from main quic.

Thanks. I will dig into it later. But I have been very busy lately, and I may reply very late. Anyway, I will try my best.

JimmyHuang454 · 2024-05-09T09:20:58Z

Android clients may use internet.UseAlternativeSystemDialer to replace v2ray system dialer (internet.DialSystem) to protect socket and prevent VPN traffic loopback. Currently hy2 does not comply with this. ~~(Nevermind I found QUIC transport doesn't comply with this too, see #1510. V2Ray just lacks a similar API for PacketConn. Maybe ignore this for now...)~~ QUIC transport uses internet.ListenSystemPacket instead. It seems that internet.ListenSystemPacket can be protected by internet.RegisterListenerController.

I mean something like the below.

Thanks, you are right. I forgot to handle that on the client side.

CodingMoeButa · 2024-05-10T16:47:50Z

建议保留brutal作为quic的一种流控算法选择，不必考虑它与hysteria的兼容性，反正hysteria已经被作为新的协议和传输层实现了。多一种选择不是坏事。

dyhkwong · 2024-05-11T02:57:12Z

proxy/hysteria2/protocol.go

+	return int(quicvarint.Len(uint64(s)))
+}
+
+func (c *ConnWriter) writeTcpHeader() error {


Can this be replaced by hyProtocol.WriteTCPRequest?

I'm afraid it won't work because WriteTCPRequest() in hyProtocol executes i := VarintPut(buf, FrameTypeTCPRequest). However, this PR aims to separate the transport layer and the proxy layer, with FrameTypeTCPRequest being sent by the transport layer.

dyhkwong · 2024-05-11T02:57:19Z

proxy/hysteria2/server.go

+		return newError("failed to send response").Base(err)
+	}
+
+	address := strings.Split(reqAddr, ":")


This doesn't work for IPv6. Maybe use net.SplitHostPort instead.

Thanks. My bad.

dyhkwong · 2024-05-11T03:00:16Z

transport/internet/hysteria2/dialer.go

+func InitTLSConifg(streamSettings *internet.MemoryStreamConfig) (*hyClient.TLSConfig, error) {
+	tlsSetting := CheckTLSConfig(streamSettings, true)
+	if tlsSetting == nil {
+		tlsSetting = &tls.Config{


There are ConfigFromStreamSettings and GetTLSConfig in github.com/v2fly/v2ray-core/v5/transport/internet/tls.

dyhkwong · 2024-06-19T12:01:22Z

A lock is needed for RunningClient map[net.Destination](hyClient.Client) (like those in quic, grpc and http). I encountered some concurrent map writes panics.

By the way, identifying clients only by net.Destination is not enough. This will cause multiple outbounds with the same destination but different streamSettings using a wrong dialer. This is a common issue for quic, grpc and http, not only this PR's hysteria though.

JimmyHuang454 · 2024-06-24T08:24:35Z

A lock is needed for RunningClient map[net.Destination](hyClient.Client) (like those in quic, grpc and http). I encountered some concurrent map writes panics.

Ofcourse.

By the way, identifying clients only by net.Destination is not enough. This will cause multiple outbounds with the same destination but different streamSettings using a wrong dialer. This is a common issue for quic, grpc and http, not only this PR's hysteria though.

I have switched to using IP addresses to differentiate between different outbound connections. At the moment, it is indeed difficult to reuse a single port for multiple inbound connections.

dyhkwong · 2024-07-23T16:06:39Z

Hi, I found that the values of congestion type, up_mbps and down_mbps are never used, so in fact it is always BBR no Brutal?

JimmyHuang454 · 2024-07-24T16:30:03Z

Hi, I found that the values of congestion type, up_mbps and down_mbps are never used, so in fact it is always BBR no Brutal?

My bad. Use the Brutal congestion algorithm when both up_mbps and down_mbps are not zero.

dyhkwong · 2024-07-24T17:59:38Z

Is that Mbps or MBps? The multiplier should be 1000*1000/8 not 1000*1000. Hysteria's case-insensitive conversation is confusing...

https://github.com/apernet/hysteria/blob/b563f3981fc63eadb6710f50eecb92922b8ae1ce/app/cmd/client.go#L317

https://github.com/apernet/hysteria/blob/master/app/internal/utils/bpsconv.go#L10-L53

JimmyHuang454 · 2024-07-24T19:33:13Z

Is that Mbps or MBps? The multiplier should be 10001000/8 not 10001000. Hysteria's case-insensitive conversation is confusing...

https://github.com/apernet/hysteria/blob/b563f3981fc63eadb6710f50eecb92922b8ae1ce/app/cmd/client.go#L317

https://github.com/apernet/hysteria/blob/master/app/internal/utils/bpsconv.go#L10-L53

My bad again. It should be 1000*1000/8.

JimmyHuang454 added 18 commits October 3, 2023 10:18

Update Protobuf

671e06c

fix vprotogen check version

257cb9f

update README

11f6704

triger test

5d89c28

fix deprecated ReadFile()

b6a0f00

fix deprecated grpc.WithInsecure()

55cfdeb

use DialEarly and rename conns

2d4f7f0

replace quic-go with apernet/quic-go

e46987d

go mode tidy

b8768ed

add quic congestion

96a1e63

fix brutal congestion setting

b912374

add congestion to quic server

5daf391

try fix quic timeout

d789bfa

fix test

be6e364

Merge branch 'master' of github.com:v2fly/v2ray-core into dev

6478c8a

update vprotogen

ecfc7f4

fix BBR test

ea84415

go mod tidy

9327ddf

JimmyHuang454 added 4 commits October 26, 2023 10:52

Merge branch 'master' of github.com:v2fly/v2ray-core into dev

44e011f

update vprotogen

07478e6

add test and fix golint

150132d

go mod tidy

0b7f037

xiaokangwang added the Extensive Review Required Require an extensive review from organization owner, cannot be merged without owner approval label Oct 28, 2023

Merge branch 'master' of github.com:v2fly/v2ray-core into dev

a7b0ef4

rename

09e1776

dyhkwong suggested changes May 11, 2024

View reviewed changes

JimmyHuang454 added 12 commits May 11, 2024 14:45

rename and fix address parsing

fe0c3aa

rename and fix address parsing

74593e0

update core version

b2cb959

Merge branch 'dev' of github.com:JimmyHuang454/v2ray-core into dev

3fdf7fe

update hysteria2

dfb42e1

mod tidy

2d0ba37

optimize GetTLSConfig()

0653961

update

8e323bf

remove and format legacy code

52c0007

update hysteria2

221a25a

update hysteria2 core

fb415bd

Merge branch 'dev' of github.com:JimmyHuang454/v2ray-core into dev

9839abd

JimmyHuang454 added 4 commits June 21, 2024 14:39

add ClientMutex

f2487ec

use net.Addr and add client retry

945b8ef

fix typo and check nil

0e5b29d

update hysteria2 core

9d89366

update core version and fix missing brutal congestion

a12c9b7

fix bandwidth bug

9bd8910

JimmyHuang454 added 2 commits July 25, 2024 03:34

fix bandwidth bug

6915928

Merge branch 'dev' of github.com:JimmyHuang454/v2ray-core into dev

0735b40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Hysteria2 Protocol #2721

Add Hysteria2 Protocol #2721

JimmyHuang454 commented Oct 22, 2023

codecov-commenter commented Oct 24, 2023 •

edited

Loading

JimmyHuang454 commented Oct 26, 2023

xiaokangwang commented Oct 28, 2023

xiaokangwang commented Oct 29, 2023

xiaokangwang commented Oct 29, 2023

JimmyHuang454 commented Oct 30, 2023

JimmyHuang454 commented May 9, 2024

CodingMoeButa commented May 10, 2024

dyhkwong May 11, 2024

JimmyHuang454 May 11, 2024

dyhkwong May 11, 2024

JimmyHuang454 May 11, 2024

dyhkwong May 11, 2024

dyhkwong commented Jun 19, 2024

JimmyHuang454 commented Jun 24, 2024

dyhkwong commented Jul 23, 2024

JimmyHuang454 commented Jul 24, 2024

dyhkwong commented Jul 24, 2024 •

edited

Loading

JimmyHuang454 commented Jul 24, 2024

Add Hysteria2 Protocol #2721

Are you sure you want to change the base?

Add Hysteria2 Protocol #2721

Conversation

JimmyHuang454 commented Oct 22, 2023

Use hysteria's quic-go to support BBR and brutal congestion algorithm

Fix vprotogen bug and update all Protobuf data

Update go version to 1.21

codecov-commenter commented Oct 24, 2023 • edited Loading

Codecov Report

JimmyHuang454 commented Oct 26, 2023

xiaokangwang commented Oct 28, 2023

xiaokangwang commented Oct 29, 2023

xiaokangwang commented Oct 29, 2023

JimmyHuang454 commented Oct 30, 2023

JimmyHuang454 commented May 9, 2024

CodingMoeButa commented May 10, 2024

dyhkwong May 11, 2024

Choose a reason for hiding this comment

JimmyHuang454 May 11, 2024

Choose a reason for hiding this comment

dyhkwong May 11, 2024

Choose a reason for hiding this comment

JimmyHuang454 May 11, 2024

Choose a reason for hiding this comment

dyhkwong May 11, 2024

Choose a reason for hiding this comment

dyhkwong commented Jun 19, 2024

JimmyHuang454 commented Jun 24, 2024

dyhkwong commented Jul 23, 2024

JimmyHuang454 commented Jul 24, 2024

dyhkwong commented Jul 24, 2024 • edited Loading

JimmyHuang454 commented Jul 24, 2024

Fix `vprotogen` bug and update all Protobuf data

codecov-commenter commented Oct 24, 2023 •

edited

Loading

dyhkwong commented Jul 24, 2024 •

edited

Loading